Fix a crash when opening the debug menu with a corrupted savegame - #6958
Merged
serprex merged 1 commit intoJul 22, 2026
Merged
Conversation
bassdr
force-pushed
the
fix/inventory-debug-menu-on-corrupted-savegame
branch
from
July 22, 2026 00:51
cc983f9 to
e1463a8
Compare
bassdr
force-pushed
the
fix/inventory-debug-menu-on-corrupted-savegame
branch
from
July 22, 2026 00:59
e1463a8 to
18fac2e
Compare
14 tasks
PurpleHato
added a commit
to PurpleHato/Shipwright
that referenced
this pull request
Jul 30, 2026
Integrate the latest Shipwright develop (LUS Fast3dGui texture-API refactor, HarbourMasters#6723 icon-based rando items, HarbourMasters#6958 corrupted-save crash fix, HarbourMasters#5838 GBK/LACS decouple) with the V2 save-editor rework. debugSaveEditor.cpp was the only conflicted file (10 hunks). Resolved by keeping V2's card-based layout and equipped-slot colored borders, while adopting develop's API, typing, and guards: - Migrated every texture lookup to Fast3dGui via GetRawInstance + the 4-arg LoadGuiTexture signature; kept V2's RG_ROCS_FEATHER(_PICKER) rando textures. - Applied HarbourMasters#6958 hardening: guarded every itemMapping.find()->second against end(), and added SLOT_NONE bounds checks in DrawInventoryTab and the button-item helpers. - Took HarbourMasters#5838's RSK_TRIFORCE_HUNT_PIECES_TOTAL>0 guard (V2 styling kept). - Kept V2's DrawEquipmentTab, small-key count/-1/MQ work, and player-state cards. - Fixed warnings that became errors under HarbourMasters#6733 (treat-warnings-as-errors): static_cast<s8> for the widened magicCapacity/ItemID fields and changed the GetMaxKeysForDungeon "no keys" sentinel from 255 to -1 (its int8_t value). Advanced submodules (libultraship/OTRExporter/ZAPDTR) to the merge's recorded commits. Builds clean (soh.exe, Release x64); clang-format clean. Co-Authored-By: Claude <noreply@anthropic.com>
PurpleHato
added a commit
to PurpleHato/Shipwright
that referenced
this pull request
Jul 30, 2026
Integrate the latest Shipwright develop (LUS Fast3dGui texture-API refactor, HarbourMasters#6723 icon-based rando items, HarbourMasters#6958 corrupted-save crash fix, HarbourMasters#5838 GBK/LACS decouple) with the V2 save-editor rework. debugSaveEditor.cpp was the only conflicted file (10 hunks). Resolved by keeping V2's card-based layout and equipped-slot colored borders, while adopting develop's API, typing, and guards: - Migrated every texture lookup to Fast3dGui via GetRawInstance + the 4-arg LoadGuiTexture signature; kept V2's RG_ROCS_FEATHER(_PICKER) rando textures. - Applied HarbourMasters#6958 hardening: guarded every itemMapping.find()->second against end(), and added SLOT_NONE bounds checks in DrawInventoryTab and the button-item helpers. - Took HarbourMasters#5838's RSK_TRIFORCE_HUNT_PIECES_TOTAL>0 guard (V2 styling kept). - Kept V2's DrawEquipmentTab, small-key count/-1/MQ work, and player-state cards. - Fixed warnings that became errors under HarbourMasters#6733 (treat-warnings-as-errors): static_cast<s8> for the widened magicCapacity/ItemID fields and changed the GetMaxKeysForDungeon "no keys" sentinel from 255 to -1 (its int8_t value). Advanced submodules (libultraship/OTRExporter/ZAPDTR) to the merge's recorded commits. Builds clean (soh.exe, Release x64); clang-format clean.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I did not find the root cause of the corruption in the first place, it was while trying to test different cases of #6951, but this crash was preventing me to restore my savegame to a valid state, as the debut tool's saveeditor inventory menu was crashing on me.
The corruption was: the bow was replaced by a golden skultula, no clue why. I was able to assign the skultula to a C trigger, but using it was also crashing the game. This is addressing only the Debug Inventory Menu crash.
Build Artifacts